Remove trace compile option from Xen.

Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/xen/Rules.mk b/xen/Rules.mk
index cb198b77f4d94e5a0c932415ac9abcda48d42d74..484130c861a4302b1561ff5e297df1598de80f2a 100644 (file)
--- a/xen/Rules.mk
+++ b/xen/Rules.mk
@@ -6,7 +6,6 @@ verbose     ?= n
 debug       ?= n
 perfc       ?= n
 perfc_arrays?= n
-trace       ?= y
 domu_debug  ?= n
 crash_debug ?= n
 
@@ -71,10 +70,6 @@ CFLAGS += -DPERF_ARRAYS
 endif
 endif
 
-ifeq ($(trace),y)
-CFLAGS += -DTRACE_BUFFER
-endif
-
 CFLAGS := $(strip $(CFLAGS))
 
 %.o: %.c $(HDRS) Makefile

diff --git a/xen/arch/x86/vmx.c b/xen/arch/x86/vmx.c
index 694b0881842b2d67301fcb5d51c74c3bea95810f..a7ba1fb3ce4710ec4d91683adfb3c9877713a41f 100644 (file)
--- a/xen/arch/x86/vmx.c
+++ b/xen/arch/x86/vmx.c
@@ -50,12 +50,8 @@ int hvm_enabled;
 unsigned int opt_vmx_debug_level = 0;
 integer_param("vmx_debug", opt_vmx_debug_level);
 
-#ifdef TRACE_BUFFER
 static unsigned long trace_values[NR_CPUS][4];
 #define TRACE_VMEXIT(index,value) trace_values[current->processor][index]=value
-#else
-#define TRACE_VMEXIT(index,value) ((void)0)
-#endif
 
 static int vmx_switch_on;
 
@@ -1686,13 +1682,11 @@ asmlinkage void vmx_vmexit_handler(struct cpu_user_regs regs)
         return;
     }
 
-#ifdef TRACE_BUFFER
     {
         __vmread(GUEST_RIP, &eip);
         TRACE_3D(TRC_VMX_VMEXIT, v->domain->domain_id, eip, exit_reason);
         TRACE_VMEXIT(0,exit_reason);
     }
-#endif
 
     switch (exit_reason) {
     case EXIT_REASON_EXCEPTION_NMI:
@@ -1881,7 +1875,6 @@ asmlinkage void load_cr2(void)
 #endif
 }
 
-#ifdef TRACE_BUFFER
 asmlinkage void trace_vmentry (void)
 {
     TRACE_5D(TRC_VMENTRY,trace_values[current->processor][0],
@@ -1899,7 +1892,6 @@ asmlinkage void trace_vmexit (void)
     TRACE_3D(TRC_VMEXIT,0,0,0);
     return;
 }
-#endif
 #endif /* CONFIG_VMX */
 
 /*

diff --git a/xen/arch/x86/x86_32/entry.S b/xen/arch/x86/x86_32/entry.S
index 31bd7b372f2a07b626c7053466f083a0912e8ba4..12878630f3425c93e2ef320ecb8b1a206de3e62e 100644 (file)
--- a/xen/arch/x86/x86_32/entry.S
+++ b/xen/arch/x86/x86_32/entry.S
@@ -126,9 +126,7 @@
 ENTRY(vmx_asm_vmexit_handler)
         /* selectors are restored/saved by VMX */
         VMX_SAVE_ALL_NOSEGREGS
-#ifdef TRACE_BUFFER
         call trace_vmexit
-#endif
         call vmx_vmexit_handler
         jmp vmx_asm_do_resume
 
@@ -150,9 +148,7 @@ ENTRY(vmx_asm_vmexit_handler)
 /* vmx_restore_all_guest */
         call vmx_intr_assist
         call load_cr2
-#ifdef TRACE_BUFFER
         call trace_vmentry
-#endif
         .endif
         VMX_RESTORE_ALL_NOSEGREGS
         /* 

diff --git a/xen/common/Makefile b/xen/common/Makefile
index 08cc0074987d9e403a5556052d11f565f965767e..1d707754567fd50b48c10142b89f465b870a648a 100644 (file)
--- a/xen/common/Makefile
+++ b/xen/common/Makefile
@@ -9,10 +9,6 @@ ifneq ($(perfc),y)
 OBJS := $(subst perfc.o,,$(OBJS))
 endif
 
-ifneq ($(trace),y)
-OBJS := $(subst trace.o,,$(OBJS))
-endif
-
 default: common.o
 common.o: $(OBJS)
        $(LD) $(LDFLAGS) -r -o common.o $(OBJS)

diff --git a/xen/common/dom0_ops.c b/xen/common/dom0_ops.c
index 8ae5f194adec5e7753da0c11220b2a87f6d7318d..aa32927565e219a950b133bde78d43d4b9f5b4a0 100644 (file)
--- a/xen/common/dom0_ops.c
+++ b/xen/common/dom0_ops.c
@@ -517,14 +517,12 @@ long do_dom0_op(dom0_op_t *u_dom0_op)
     }
     break;
 
-#ifdef TRACE_BUFFER
     case DOM0_TBUFCONTROL:
     {
         ret = tb_control(&op->u.tbufcontrol);
         copy_to_user(u_dom0_op, op, sizeof(*op));
     }
     break;
-#endif
     
     case DOM0_READCONSOLE:
     {

diff --git a/xen/include/xen/trace.h b/xen/include/xen/trace.h
index ff391f0ff35269af2f7ccd1bb1462e99e06709dd..4e2b431eeb8d3ce2a2a9f61e35b9e5ed1b5633b3 100644 (file)
--- a/xen/include/xen/trace.h
+++ b/xen/include/xen/trace.h
@@ -23,8 +23,6 @@
 #ifndef __XEN_TRACE_H__
 #define __XEN_TRACE_H__
 
-#ifdef TRACE_BUFFER
-
 #include <asm/page.h>
 #include <xen/types.h>
 #include <xen/sched.h>
@@ -120,17 +118,4 @@ static inline int trace(u32 event, unsigned long d1, unsigned long d2,
 #define TRACE_4D(event,d1,d2,d3,d4)    trace_do_casts(event,d1,d2,d3,d4,0 )
 #define TRACE_5D(event,d1,d2,d3,d4,d5) trace_do_casts(event,d1,d2,d3,d4,d5)
 
-#else
-
-#define init_trace_bufs() ((void)0)
-
-#define TRACE_0D(event)                ((void)0)
-#define TRACE_1D(event,d)              ((void)0)
-#define TRACE_2D(event,d1,d2)          ((void)0)
-#define TRACE_3D(event,d1,d2,d3)       ((void)0)
-#define TRACE_4D(event,d1,d2,d3,d4)    ((void)0)
-#define TRACE_5D(event,d1,d2,d3,d4,d5) ((void)0)
-
-#endif /* TRACE_BUFFER */
-
 #endif /* __XEN_TRACE_H__ */